Rewriting tree model mathematical operators#16786
Open
Cool6689 wants to merge 5 commits intoapache:masterfrom
Open
Rewriting tree model mathematical operators#16786Cool6689 wants to merge 5 commits intoapache:masterfrom
Cool6689 wants to merge 5 commits intoapache:masterfrom
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Pull request overview
This PR refactors arithmetic operators for tree models by introducing TSDataType-based type inference alongside the existing Type system. The refactoring delegates operator type resolution to dedicated resolver classes and introduces a new API layer (ArithmeticColumnTransformerApi) for creating column transformers.
Key changes:
- Added TSDataType support to arithmetic resolver classes (Addition, Subtraction, Multiplication, Division, Modulus)
- Refactored ColumnTransformerVisitor to use ArithmeticColumnTransformerApi instead of direct transformer instantiation
- Updated ExpressionTypeAnalyzer to use resolver-based type inference with comprehensive error handling
- Added SessionInfo integration for ZoneId access in operator tree generation
- Expanded test coverage for DATE/TIMESTAMP arithmetic, negation operations, overflow handling, and error cases
Reviewed changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| AdditionResolver.java | Added CONDITION_MAP_TREE and inferType method for TSDataType support with DATE/TIMESTAMP operations |
| SubtractionResolver.java | Added CONDITION_MAP_TREE and inferType method for TSDataType support with DATE/TIMESTAMP operations |
| MultiplicationResolver.java | Added CONDITION_MAP_TREE and inferType method for TSDataType support (no DATE/TIMESTAMP) |
| ModulusResolver.java | Added CONDITION_MAP_TREE and inferType method for TSDataType support (no DATE/TIMESTAMP) |
| DivisionResolver.java | Added CONDITION_MAP_TREE and inferType method for TSDataType support (no DATE/TIMESTAMP) |
| ColumnTransformerVisitor.java | Replaced direct transformer instantiation with ArithmeticColumnTransformerApi calls; added SessionInfo/ZoneId support |
| ExpressionTypeAnalyzer.java | Refactored arithmetic type inference to use resolver classes with improved error messages |
| OperatorTreeGenerator.java | Added SessionInfo parameter to ColumnTransformerVisitorContext constructors |
| IoTDBArithmeticIT.java | Added comprehensive tests for new DATE/TIMESTAMP arithmetic, negation, overflow, and error handling |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
You can also share your feedback on Copilot code review for a chance to win a $100 gift card. Take the survey.
| import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticModuloColumnTransformer; | ||
| import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticMultiplicationColumnTransformer; | ||
| import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticSubtractionColumnTransformer; | ||
| import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticColumnTransformerApi; |
There was a problem hiding this comment.
The ArithmeticColumnTransformerApi class is imported and used throughout this file but is not included in this PR. This will cause compilation failures as the class doesn't exist in the codebase. The API class must be added to the PR or this import should reference an existing class.
Suggested change
| import org.apache.iotdb.db.queryengine.transformation.dag.column.binary.ArithmeticColumnTransformerApi; |
Comment on lines
+90
to
+131
| addConditionTS(TSDataType.INT32, TSDataType.INT32, TSDataType.INT32); | ||
| addConditionTS(TSDataType.INT32, TSDataType.INT64, TSDataType.INT64); | ||
| addConditionTS(TSDataType.INT32, TSDataType.FLOAT, TSDataType.FLOAT); | ||
| addConditionTS(TSDataType.INT32, TSDataType.DOUBLE, TSDataType.DOUBLE); | ||
| addConditionTS(TSDataType.INT32, TSDataType.DATE, TSDataType.DATE); | ||
| addConditionTS(TSDataType.INT32, TSDataType.TIMESTAMP, TSDataType.TIMESTAMP); | ||
| addConditionTS(TSDataType.INT32, TSDataType.UNKNOWN, TSDataType.INT32); | ||
|
|
||
| addConditionTS(TSDataType.INT64, TSDataType.INT32, TSDataType.INT64); | ||
| addConditionTS(TSDataType.INT64, TSDataType.INT64, TSDataType.INT64); | ||
| addConditionTS(TSDataType.INT64, TSDataType.FLOAT, TSDataType.FLOAT); | ||
| addConditionTS(TSDataType.INT64, TSDataType.DOUBLE, TSDataType.DOUBLE); | ||
| addConditionTS(TSDataType.INT64, TSDataType.DATE, TSDataType.DATE); | ||
| addConditionTS(TSDataType.INT64, TSDataType.TIMESTAMP, TSDataType.TIMESTAMP); | ||
| addConditionTS(TSDataType.INT64, TSDataType.UNKNOWN, TSDataType.INT64); | ||
|
|
||
| addConditionTS(TSDataType.FLOAT, TSDataType.INT32, TSDataType.FLOAT); | ||
| addConditionTS(TSDataType.FLOAT, TSDataType.INT64, TSDataType.FLOAT); | ||
| addConditionTS(TSDataType.FLOAT, TSDataType.FLOAT, TSDataType.FLOAT); | ||
| addConditionTS(TSDataType.FLOAT, TSDataType.DOUBLE, TSDataType.DOUBLE); | ||
| addConditionTS(TSDataType.FLOAT, TSDataType.UNKNOWN, TSDataType.FLOAT); | ||
|
|
||
| addConditionTS(TSDataType.DOUBLE, TSDataType.INT32, TSDataType.DOUBLE); | ||
| addConditionTS(TSDataType.DOUBLE, TSDataType.INT64, TSDataType.DOUBLE); | ||
| addConditionTS(TSDataType.DOUBLE, TSDataType.FLOAT, TSDataType.DOUBLE); | ||
| addConditionTS(TSDataType.DOUBLE, TSDataType.DOUBLE, TSDataType.DOUBLE); | ||
| addConditionTS(TSDataType.DOUBLE, TSDataType.UNKNOWN, TSDataType.DOUBLE); | ||
|
|
||
| addConditionTS(TSDataType.DATE, TSDataType.INT32, TSDataType.DATE); | ||
| addConditionTS(TSDataType.DATE, TSDataType.INT64, TSDataType.DATE); | ||
| addConditionTS(TSDataType.DATE, TSDataType.UNKNOWN, TSDataType.DATE); | ||
|
|
||
| addConditionTS(TSDataType.TIMESTAMP, TSDataType.INT32, TSDataType.TIMESTAMP); | ||
| addConditionTS(TSDataType.TIMESTAMP, TSDataType.INT64, TSDataType.TIMESTAMP); | ||
| addConditionTS(TSDataType.TIMESTAMP, TSDataType.UNKNOWN, TSDataType.TIMESTAMP); | ||
|
|
||
| addConditionTS(TSDataType.UNKNOWN, TSDataType.INT32, TSDataType.INT32); | ||
| addConditionTS(TSDataType.UNKNOWN, TSDataType.INT64, TSDataType.INT64); | ||
| addConditionTS(TSDataType.UNKNOWN, TSDataType.FLOAT, TSDataType.FLOAT); | ||
| addConditionTS(TSDataType.UNKNOWN, TSDataType.DOUBLE, TSDataType.DOUBLE); | ||
| addConditionTS(TSDataType.UNKNOWN, TSDataType.DATE, TSDataType.DATE); | ||
| addConditionTS(TSDataType.UNKNOWN, TSDataType.TIMESTAMP, TSDataType.TIMESTAMP); |
There was a problem hiding this comment.
The CONDITION_MAP_TREE initialization duplicates the exact same type promotion rules as CONDITION_MAP (lines 47-88). This duplication exists across all five resolver classes (Addition, Subtraction, Multiplication, Modulus, Division). Consider extracting this logic into a shared utility method or using a conversion function between Type and TSDataType to maintain a single source of truth for type promotion rules.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR achieves the refactoring of mathematical operators for tree models by reusing the type inference and runtime execution infrastructure generated by the FreeMarker template engine.